From: iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Date: Fri, 11 Jun 2004 22:04:24 +0000 (+0000)
Subject: bitkeeper revision 1.958 (40ca2c68fktLFIliN8Vr7Q8blSgj6w)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~18163
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=f594e6898d74df746ae2ee91560fd73f856799e9;p=xen.git

bitkeeper revision 1.958 (40ca2c68fktLFIliN8Vr7Q8blSgj6w)

merge
---

f594e6898d74df746ae2ee91560fd73f856799e9
diff --cc BitKeeper/etc/ignore
index 97a38b7ac4,79939d955a..cf002e46db
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -1,21 -1,22 +1,24 @@@
--BitKeeper/*/*
--PENDING/*
++*.a
  *.o
++*.pyc
  *.so
  *.so.*
--*.a
--*.pyc
++BitKeeper/*/*
++PENDING/*
++TAGS
  extras/mini-os/h/hypervisor-ifs
++install/*
++linux-*-xen/*
++linux-*.tar.gz
+ linux-2.4.26-xen/*
  linux-xen-sparse
  tools/*/build/lib*/*.py
  tools/balloon/balloon
  tools/misc/miniterm/miniterm
--tools/misc/xen_read_console
  tools/misc/xen_cpuperf
  tools/misc/xen_log
++tools/misc/xen_read_console
  tools/xentrace/xentrace
--xen/xen
--xen/xen.*
  xen/drivers/pci/classlist.h
  xen/drivers/pci/devlist.h
  xen/drivers/pci/gen-devlist
@@@ -24,7 -25,4 +27,5 @@@ xen/include/hypervisor-ifs/arc
  xen/include/xen/compile.h
  xen/tools/elf-reloc
  xen/tools/figlet/figlet
--TAGS
- install/*
- linux-*.tar.gz
- linux-*-xen/*
++xen/xen
++xen/xen.*
diff --cc linux-2.4.26-xen-sparse/arch/xen/Makefile
index 37d71473b0,a8c7def633..d29d9d51f3
--- a/linux-2.4.26-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.26-xen-sparse/arch/xen/Makefile
@@@ -123,11 -115,6 +123,7 @@@ archclean
  	@$(MAKEBOOT) clean
  
  archmrproper:
 +	rm -f include/asm-xen/hypervisor-ifs/arch
- 	rm -f $(prefix)/boot/vmlinux-syms-$(KERNELRELEASE)
- 	rm -f $(prefix)/boot/vmlinuz-$(KERNELRELEASE)
  
  archdep:
- 	rm -f include/asm-xen/hypervisor-ifs/arch
- 	( cd include/asm-xen/hypervisor-ifs ; rm -rf arch ; ln -sf arch-x86 arch)
  	@$(MAKEBOOT) dep